Develop

Fix #39, #48
Improve #36