Closes #66! This commit should fix the boot issue.
Merge remote-tracking branch 'origin/master'