closes #22
add @override
Merge remote-tracking branch '52North/master' into merge_dushyant