Merge branch 'release/0.4' into develop
fix release docs
implemented new map option allowing use of custom map markers
bugfixes
work on docs
bumbed version number
Merge branch 'release/0.5'