Update

Merged Bay code, a lot of things fixed.
Merge pull request #116 from skull132/master

Update 12JUN2014