Bugfixes
#FIX: Fixed issue #53