Bug fixes, merge support
Initial commit