Merge pull request #22 from DSkywalk/master