PR 13 in core
Fixed PR 13
Merge master/0.1.5