fixes issue #1
Merge branch 'master' of github.com:heroic/amit-test