Bugfix and a few minor changes

Brickimedia/brickimedia#104