Merge pull request #12 from horoking/master

Changes