Fixed inverted urls bug
Did some clean up
0.3.12
0.3.13