Removed (now in bindata)
Fixed build
Merge branch 'testing'