closes #126
Merge remote-tracking branch '52North/develop'