29 Jan 2014
Merge pull request #2 from ansehelm/master

Merge from LUC