Feature

Catching up with Master repo (bug #3 and #6 fixed).