New version

Had some troubles with merging my branches. Lost some history.