Issue 161

pull in issue #161 into master, old file structure including compass extension moved to `pre-issue-161 branch`