Merge pull request #6 from bootstraponline/master

Change package to avoid conflicts