Merge pull request #18 from jvkumar/3

Fixes#3 WIP
Fixes#3 WIP bootstrap
Fixes #3 WIP