Merge pull request #45 from Nawuko/master

LS: Fix issue https://github.com/andreaslarsen/parentheme/issues/44
LS: Cleanup