bugfix
Merge pull request #12 from kimisera/master

bugfix
Merge remote-tracking branch 'upstream/master' into gh-pages