syncing changes
Merge pull request #4 from dizz/master

syncing changes