Closes #7. Add OOB support
0.6.0