Workaround for issue #43

The related Pandas bug is: https://github.com/pydata/pandas/issues/3593

+ Code beautification.
Merge branch 'master' of https://github.com/eike-welk/clair