Merged #135 into dev branch
Merged #125 into dev branch