fix issue #59
Merge branch 'develop' into feature/20140330-fix-issue59
Merge branch 'feature/20140330-fix-issue59' into develop

* feature/20140330-fix-issue59:
  fix issue #59