Fixed constructor
Merge branch 'master' of github.com:cr0hn/golismero