changes
Merge pull request #18 from maketas/master

changes