many changes etc
Merge pull request #12 from iangfleming/honeybear

many changes etc