Merge pull request #5 from lokedhs/master