First pass at adding type(); about to do some regex-foo
Testing #70 against stoke.
Merge branch 'issue-70' into develop