Updated to  Version 0.1.6