Bundle cleanup
Merge pull request #6 from inspiran/master

Bundle cleanup