[bugs:384] fix
Merge pull request #8 from vomikan/master

[bugs:384] fix
build both master and develop branches