Merge pull request #3 from axemclion/master