kwohlfahrt Merge pull request #6 from costructuralist/master …