Commit 01/09/2014

Close issue #16 and #20