Merge pull request #2 from fikovnik/master

Minor updates for boot2docker compatibility
some small changes to match newer boot2docker
Merge remote-tracking branch 'upstream/master'
Added a workaround boot2docker issue [#367](https://github.com/boot2docker/boot2docker/issues/367)