Additional bootstrap
fixed merges
Merge pull request #31 from garrettlord/dddiehn

Dddiehn
BASIC API
fixed merges