Location not decided yet
Merge pull request #25 from dotKom/2014-tweaks

Location not decided yet