Commit #4
Merge resolved #2
#5 from VS
Conflict resolved.