Merge pull request #151 from buildoop/buildoop-v1-dev

New buildoop ready to work - merging with buildoop-v1-master branch