fixed #13: revised basics