merge reques #2

some additions in #12