Merge with MVVMlighting

Some changes to refactor code