Working towards 1.0

Added polimenary test and updated the code a bit