Merge staging with master

More improvements and added functionality