Major Update

Basic shape detection added.
Code cleaned.
Usability/stability improvements.