Dev

merging fork with new features.