Version 1.0 beta

functional version with minor bugs