Merge pull request #189 from Ishap/master

Update to latest bay master