Switched to a slightly safer, more flexable version
0.0.2