Incorporated changes by mhaisley into new release 0.1.2