fix bug #5
Merge branch 'unstable' of github.com:openplacos/openplacos into unstable