Merged build scripts
Bug fixes
Updated README