Merge pull request #1 from cifffen/master

Test
Merge pull request #2 from cifffen/master

07.02
Merge pull request #3 from cifffen/master

Base code ready for debugging and testing
Update
Merge branch 'master' of https://github.com/cifffen/heis