fixed #17, #18
Merge branch 'develop'