Fixed issue #15
Merge branch 'dev' of https://github.com/corvusalba/toy-factory into dev