Merge pull request #13 from exfm/dan-dev

Dan dev
Merge branch 'dev' into dan-dev