Task #1 and #2 for issue #42 done