fixing some minor bugs.
Merge branch 'develop' of https://github.com/banterle/piccante into develop