Apply changes and tweaks
Merge pull request #32 from mmmavis/develop

Apply changes and tweaks