Feature/#114

pull feature #114  from sven lehmanns fork