#40 replaced tabs with spaces (yew), removed usage of deprecated method