first pass
fixed bug
Merge branch 'master' of github.com:hardbyte/mandela